Revision: tla-tools--mainline--1.0--patch-7
Archive: walters@verbum.org--2003
Creator: Colin Walters <walters@verbum.org>
Date: Sat Sep 27 17:19:27 EDT 2003
Standard-date: 2003-09-27 21:19:27 GMT
New-files: tla-fix-changelog-conflicts.shpp
    tla-munge-archive-names.shpp
Modified-files: ChangeLog Makefile.in tla-copy-changes.shpp
    tla-cvs-sync.shpp tla-file-log.shpp tla-tools-funs.awk
    {arch}/=tagging-method
New-patches: miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-55
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-56
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-57
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-58
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-59
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-60
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-61
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-62
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-63
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-64
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-65
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-66
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-67
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-68
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-69
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-70
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-71
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-72
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-73
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-74
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-75
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-76
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-77
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-78
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-79
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-80
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-81
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-82
    miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-83
    miles@gnu.org--gnu-2003/tla-tools--x--0--base-0
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-1
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-2
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-3
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-4
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-5
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-6
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-7
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-8
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-9
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-10
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-11
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-12
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-13
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-14
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-15
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-16
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-17
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-18
    miles@gnu.org--gnu-2003/tla-tools--x--0--patch-19
    walters@verbum.org--2003/tla-tools--mainline--1.0--patch-7
Summary: merge with miles

merge with miles

Patches applied:

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-55
   Support --skip-present

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-56
   Use new replay syntax, without --exact

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-57
   Don't try to commit .arch-ids files to CVS

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-58
   Try even harder not to commit .arch-ids files to CVS

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-59
   Revert patch-55 and patch-56

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-60
   Include files that had conflicts when we commit to CVS

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-61
   Try to make tla-file-log handle renames

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-62
   Add tla-fix-changelog-conflicts

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-63
   Make tla-cvs-sync use tree-lint --strict

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-64
   Try to fix changelog conflicts in tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-65
   Commenting and cosmetic tweaks to tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-66
   Make tla-cvs-sync only do one `cvs update'

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-67
   Make tla-fix-changelog-conflicts handle unidiffs; clean up code a bit

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-68
   Try to preserve file permissions in tla-fix-changelog-conflicts

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-69
   Don't use non-existant arg in make_cmd

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-70
   Include patch-log for tla-tools--x--0--base-0

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-71
   Small tweaks to tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-72
   Add some name-manipulation functions to tla-tools-funs.awk

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-73
   Add tla-munge-archive-names.shpp (not working yet)

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-74
   Finish-up tla-munge-archive-names

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-75
   Consider untagged files as unrecognized

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-76
   Show output of cvs update command

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-77
   Cache munged versions; also some code cleanup and commenting

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-78
   Generate correct awk regexps in tla-munge-archive-names

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-79
   Install tla-munge-archive-names

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-80
   Merge from tla-tools--x

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-81
   Update ChangeLog after merge with tla--x

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-82
   Make tla-fix-changelog-conflicts exit with correct status

 * miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-83
   Improve conflict handling in tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--x--0--base-0
   tag of miles@gnu.org--gnu-2003/tla-tools--devo--0--patch-58

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-1
   Include files that had conflicts when we commit to CVS

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-2
   Try to make tla-file-log handle renames

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-3
   Add tla-fix-changelog-conflicts

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-4
   Make tla-cvs-sync use tree-lint --strict

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-5
   Try to fix changelog conflicts in tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-6
   Commenting and cosmetic tweaks to tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-7
   Make tla-cvs-sync only do one `cvs update'

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-8
   Make tla-fix-changelog-conflicts handle unidiffs; clean up code a bit

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-9
   Try to preserve file permissions in tla-fix-changelog-conflicts

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-10
   Don't use non-existant arg in make_cmd

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-11
   Small tweaks to tla-cvs-sync

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-12
   Add some name-manipulation functions to tla-tools-funs.awk

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-13
   Add tla-munge-archive-names.shpp (not working yet)

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-14
   Finish-up tla-munge-archive-names

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-15
   Consider untagged files as unrecognized

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-16
   Show output of cvs update command

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-17
   Cache munged versions; also some code cleanup and commenting

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-18
   Generate correct awk regexps in tla-munge-archive-names

 * miles@gnu.org--gnu-2003/tla-tools--x--0--patch-19
   Install tla-munge-archive-names

